projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4eb34cc
)
(EmacsMenu-menuNeedsUpdate): Ignore if frame has been deleted (bug #4492).
author
Adrian Robert
<Adrian.B.Robert@gmail.com>
Tue, 22 Sep 2009 19:49:50 +0000
(19:49 +0000)
committer
Adrian Robert
<Adrian.B.Robert@gmail.com>
Tue, 22 Sep 2009 19:49:50 +0000
(19:49 +0000)
src/nsmenu.m
patch
|
blob
|
history
diff --git
a/src/nsmenu.m
b/src/nsmenu.m
index 335e4c0e640b7a8ea3424710b3fbdb9fb8ff9b1a..79644d28a8088cc6a27a3d16297dcb18786bb8fe 100644
(file)
--- a/
src/nsmenu.m
+++ b/
src/nsmenu.m
@@
-568,7
+568,10
@@
name_is_separator (name)
to set_frame_menubar */
- (void)menuNeedsUpdate: (NSMenu *)menu
{
- NSEvent *event = [[FRAME_NS_VIEW (frame) window] currentEvent];
+ NSEvent *event;
+ if (!FRAME_LIVE_P (frame))
+ return;
+ event = [[FRAME_NS_VIEW (frame) window] currentEvent];
/* HACK: Cocoa/Carbon will request update on every keystroke
via IsMenuKeyEvent -> CheckMenusForKeyEvent. These are not needed
since key equivalents are handled through emacs.